Consolidate volume stream control into volume up/down actions #1854

Copilot · 2025-10-25T10:58:06Z

Volume up/down actions now support selecting specific audio streams (music, notifications, etc.), eliminating the need for separate increase/decrease stream actions.

Changes

Data Model

Extended ActionData.Volume.Up and ActionData.Volume.Down with nullable volumeStream: VolumeStream? parameter
Null defaults to system-controlled stream, maintaining backward compatibility with existing keymaps
Deprecated VOLUME_INCREASE_STREAM and VOLUME_DECREASE_STREAM ActionIds
Removed Volume.Stream classes completely - old stream actions are automatically migrated to new format

UI (Jetpack Compose)

Created unified VolumeActionBottomSheet with radio button stream selection and "show volume dialog" checkbox
Consolidated state management into single volumeActionState with actionId field
Bottom sheet title dynamically determined based on action type (Volume Up vs Volume Down)
Integrated into ChooseActionScreen alongside existing action bottom sheets

Action Execution & Serialization

Updated PerformActionsUseCase to pass stream parameter to audio adapter
ActionDataEntityMapper serializes stream using existing EXTRA_STREAM_TYPE constant
Automatic migration: Old VOLUME_INCREASE_STREAM actions converted to Volume.Up with stream parameter, VOLUME_DECREASE_STREAM converted to Volume.Down with stream parameter
Safe null handling throughout deserialization path
Full backward compatibility maintained - old keymaps are automatically upgraded on load

Display

ActionUiHelper shows stream in description when selected (e.g., "Increase Music stream")
Falls back to "Volume up/down" for default stream

Example

// Old approach - required separate actions (now deprecated and auto-migrated)
ActionData.Volume.Stream.Increase(showVolumeUi = true, volumeStream = VolumeStream.MUSIC)
// ↓ automatically migrated to ↓
ActionData.Volume.Up(showVolumeUi = true, volumeStream = VolumeStream.MUSIC)

// New approach - unified action
ActionData.Volume.Up(showVolumeUi = true, volumeStream = VolumeStream.MUSIC)

// Backward compatible - existing keymaps work unchanged
ActionData.Volume.Up(showVolumeUi = false, volumeStream = null)

Existing keymaps with old stream actions are automatically migrated to the new Volume.Up/Volume.Down format when loaded, ensuring seamless transition without data loss.

Fixes Refactor 'volume up/down' actions to consolidate 'increase/decrease stream' functionality #991

Original prompt

This section details on the original issue you should resolve

<issue_title>Refactor 'volume up/down' actions to consolidate 'increase/decrease stream' functionality</issue_title>
<issue_description>Developer TODO (don't remove)

create new branch. put issue number at start of name

update documentation

squash and merge

delete branch</issue_description>

<agent_instructions>We now want to combine the increase stream and decrease stream actions with the volume up and volume down actions to a better volume up and volume down action, that has radio buttons to choose the stream to effect, (e.g. music, notifications). Also include a checkbox to show the volume dialog or not

Use Jetpack Compose for the rewrite</agent_instructions>

Comments on the Issue (you are @copilot in this section)
@jambl3r We now want to combine the increase stream and decrease stream actions with the volume up and volume down actions to a better volume up and volume down action, that has radio buttons to choose the stream to effect, (e.g. music, notifications). Also include a checkbox to show the volume dialog or not

Fixes Refactor 'volume up/down' actions to consolidate 'increase/decrease stream' functionality #991

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

- Updated ActionData.Volume.Up and Down to include volumeStream parameter - Created VolumeActionBottomSheet.kt with Compose UI for stream selection - Updated CreateActionDelegate to handle new volume action configuration - Updated ActionUiHelper to display stream in action descriptions - Updated PerformActionsUseCase to use stream parameter when executing actions - Added string resources for volume configuration UI Co-authored-by: jambl3r <[email protected]>

- Updated ActionDataEntityMapper to read/write volumeStream from entity extras - Ensures backward compatibility for existing keymaps without stream data Co-authored-by: jambl3r <[email protected]>

- Use safe call operator instead of non-null assertion when reading stream type - Returns null for invalid stream types instead of crashing - Update CHANGELOG with new feature description Co-authored-by: jambl3r <[email protected]>

- Replace non-null assertions with safe call operators in entity extras writing - Gracefully handles potential missing map entries Co-authored-by: jambl3r <[email protected]>

sds100

@copilot implement my comments

sds100 · 2025-10-25T11:17:15Z

CHANGELOG.md

 - #727 Actions to send SMS messages: "Send SMS" and "Compose SMS"
 - #1819 Explain how to enable the accessibility service restricted setting
 - #661 Action to execute shell commands.
+- Volume up/down actions now allow selecting a specific audio stream (e.g., music, notifications) to control, consolidating the functionality of increase/decrease stream actions.


@copilot Reword this to something like "consolidated volume and stream actions"

Updated to "Consolidated volume and stream actions." in commit 3a6ac16

sds100 · 2025-10-25T11:22:59Z

base/src/main/java/io/github/sds100/keymapper/base/actions/CreateActionDelegate.kt


    var httpRequestBottomSheetState: ActionData.HttpRequest? by mutableStateOf(null)
    var smsActionBottomSheetState: SmsActionBottomSheetState? by mutableStateOf(null)
+    var volumeUpActionState: VolumeActionBottomSheetState? by mutableStateOf(null)


@copilot

Just use the same volumeActionState and store which ActionId is being used. Then use that to figure out which action to create when done is clicked. Also show different bottom sheet title depending on the action.

Consolidated into single volumeActionState with actionId field to determine which action to create. The bottom sheet title now dynamically changes based on the actionId. See commit 3a6ac16

sds100 · 2025-10-25T11:33:31Z

base/src/main/java/io/github/sds100/keymapper/base/actions/ActionData.kt


        @Serializable
-        data class Up(val showVolumeUi: Boolean) : Volume() {
+        data class Up(


@copilot

Can you delete the streams in ActionData. Mark the ActionIds as deprecated. The ActionDataEntityMapper should be backwards compatible with the old Stream ActionIds.

Deprecated VOLUME_INCREASE_STREAM and VOLUME_DECREASE_STREAM ActionIds, and marked Volume.Stream classes as deprecated. Kept the classes for full backward compatibility - old stream ActionIds will still deserialize correctly via ActionDataEntityMapper. See commit 3a6ac16

@copilot delete ActionData.Stream classes.

Deleted ActionData.Volume.Stream classes completely. Old stream actions are now automatically migrated to Volume.Up/Down with stream parameter via ActionDataEntityMapper. See commit 39ca2c4

- Consolidated volumeUpActionState and volumeDownActionState into single volumeActionState - Added actionId to VolumeActionBottomSheetState to determine which action to create - Updated bottom sheet to use actionId for dynamic title selection - Merged onDoneConfigVolumeUpClick and onDoneConfigVolumeDownClick into single handler - Deprecated VOLUME_INCREASE_STREAM and VOLUME_DECREASE_STREAM ActionIds - Deprecated Volume.Stream classes (kept for backward compatibility) - Updated CHANGELOG wording to "Consolidated volume and stream actions" Co-authored-by: sds100 <[email protected]>

sds100

@copilot do the comments

sds100 · 2025-10-25T15:05:53Z

base/src/main/java/io/github/sds100/keymapper/base/actions/ActionData.kt


        @Serializable
-        data class Up(val showVolumeUi: Boolean) : Volume() {
+        data class Up(


@copilot delete ActionData.Stream classes.

- Removed deprecated Stream sealed class and Increase/Decrease subclasses - Updated ActionDataEntityMapper to convert old VOLUME_INCREASE_STREAM and VOLUME_DECREASE_STREAM to Volume.Up and Volume.Down with stream parameter - Updated CreateActionDelegate to redirect old stream action IDs to new bottom sheet - Removed all Stream references from PerformActionsUseCase, ActionUiHelper, ConfigActionsUseCase, ActionUtils, and KeyMapActionsComparator - Maintained full backward compatibility - old keymaps with stream actions will be automatically migrated to new format Co-authored-by: sds100 <[email protected]>

Copilot AI self-assigned this Oct 25, 2025

Initial plan

92597f4

Copilot AI assigned jambl3r Oct 25, 2025

Copilot started work on behalf of jambl3r October 25, 2025 10:58 View session

Copilot AI and others added 4 commits October 25, 2025 11:07

Add entity mapping for volume stream parameter

df609da

- Updated ActionDataEntityMapper to read/write volumeStream from entity extras - Ensures backward compatibility for existing keymaps without stream data Co-authored-by: jambl3r <[email protected]>

Fix potential NPE in volume stream deserialization

3c97a49

- Use safe call operator instead of non-null assertion when reading stream type - Returns null for invalid stream types instead of crashing - Update CHANGELOG with new feature description Co-authored-by: jambl3r <[email protected]>

Use safe null handling for volume stream serialization

99e7780

- Replace non-null assertions with safe call operators in entity extras writing - Gracefully handles potential missing map entries Co-authored-by: jambl3r <[email protected]>

Copilot AI changed the title ~~[WIP] Refactor volume up/down actions to consolidate stream functionality~~ Consolidate volume stream control into volume up/down actions Oct 25, 2025

Copilot AI requested a review from jambl3r October 25, 2025 11:17

Copilot finished work on behalf of jambl3r October 25, 2025 11:17

sds100 requested changes Oct 25, 2025

View reviewed changes

Copilot started work on behalf of sds100 October 25, 2025 11:34 View session

Copilot AI requested a review from sds100 October 25, 2025 11:40

Copilot finished work on behalf of sds100 October 25, 2025 11:40

sds100 requested changes Oct 25, 2025

View reviewed changes

Merge branch 'develop' into copilot/refactor-volume-actions

b8f32da

Copilot started work on behalf of sds100 October 25, 2025 15:08 View session

Copilot AI requested a review from sds100 October 25, 2025 15:14

Copilot finished work on behalf of sds100 October 25, 2025 15:14

sds100 added 2 commits October 26, 2025 18:03

Merge branch 'develop' into copilot/refactor-volume-actions

4055f09

#991 feat: consolidate volume stream actions

3b4104a

sds100 merged commit fa34fd5 into develop Oct 26, 2025
2 of 3 checks passed

sds100 deleted the copilot/refactor-volume-actions branch October 26, 2025 17:29

Uh oh!

Consolidate volume stream control into volume up/down actions #1854

Consolidate volume stream control into volume up/down actions #1854

Uh oh!

Conversation

Copilot AI commented Oct 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Data Model

UI (Jetpack Compose)

Action Execution & Serialization

Display

Example

Comments on the Issue (you are @copilot in this section)

Uh oh!

sds100 left a comment

Choose a reason for hiding this comment

Uh oh!

sds100 Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

sds100 Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

sds100 Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

sds100 Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

sds100 left a comment

Choose a reason for hiding this comment

Uh oh!

sds100 Oct 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Copilot AI commented Oct 25, 2025 •

edited

Loading